Removed dependency and modified interfaces.