Draft: Simplified and reduced feature set