Refactored prototype includes