Added the MakamFeatureExtractor classes