Service layer validation added

Change-Id: I96407bf3e384ef84260e0b7734641836b44b8490