Fixing methods signature to match interface