Fixed inter-library dependency issue
Committing previous changes to system