Refactored how parts are included