Removed independent column mapping from models for flexibility