Break free from the feature factory