Added Include & Exclude functionality for tables to be modeled, and corrected some style in model and mapping