Added support for includes and excludes