Simplified API and fixed specs