Simplified implementation