Refactored more methods