Adding methods to return hashmaps instead lists