moved mappings and functions to custom files