refactored: added more settings and mapping