Improved specs in general