Refactored some more method signatures