update feature matrix, introduce macros for method names