Changed return type to super class