Added map interface again and 2 other map classes.