Jace #22: Added feature mapping functionality

* Minor refactorings and fixes