Refactored to use base controller for cleaner method signatures.
Refactored to use base controller for cleaner method signatures.