added time spec utils, improved some code. Step to reusability