adding method hooks and refactored package names