Simplified feature resolution logic