Moo wrapper refactoring