Reworking conversions

Changing conversions from hardcoded values to hashmap