Removed Hash Maps and made it dynamic