[TASK] Adjust Arrangement Model to reflect all available database fields