small changes in Unit API

Change-Id: I267748a707d638ad9a5b6ff6063743b1fd4a1be2
Signed-off-by: MarceloPortilho <marceloport@gmail.com>