Add missing rules+: blocks

Change-Id: Ia3e7dcc08a69f8863aefbd85c82f90d98e354f9e
Add time units

Change-Id: I85bd396bdf20d25a4947e699c8141feafd3dac82
Added string bits parsing

Change-Id: Ife4232a8fae6e96df72fb50596e4091b2f4495ac