Enhancements to spec file