Code cleanup and add ability to specify custom include param.