Changed from ugly array to Maps