Added some unit-level specification