Refactor to better accommodate includes/excludes