Updated returned values of methods to be array of hashes for better code pattern