Changed 2nd class to hash instead