Updated design philosophy
Bug fix for IncludeNode