Removing dependency on other modules