Added Map controller