Resolve issue with circular dependecies

Change-Id: I19ca8ed596550fbd564896aed6cd6d27c7212636