Extracted infrastructure (holding mappings for now) to seperate project