Changed return to associative array