Fixing methods signature to match the interface