Add @current_user shortcut. Add dependant_ids to Assembly