Fix interfaces and add method bodies