Cleaned up operations implementations