Move method calls into proxy