Small refactoring
Create Spec API