Moved the methods for dependency management to a seperate struct, and added dependency inclusion for properties.