Updated to_dict so it correctly handles column excludes and includes
Updated to_dict so it correctly handles column excludes and includes