JLScope Dependencies and Hierarchy fixes