Altered mechanics for handling constants and includes