Simplified some specs