Refactoring method signatures according to latest GateIn stuff