Implemented feat_options and cleanup