Added/refactored controller methods