Refactored target methods