dependency refactored, new facilities added