Changed returns to hashmaps