Refactor: Removing map structure