Done some refactoring with GAPPS method stubs.