move builder out of features class