Refactor AbstractColumnDefinitionBuilder
#901
Merged
AbstractColumnDefinitionBuilder
#901