Added Generic Map Functionality