Added basic Map and Square classes