Continue working on mandatory conditions implementation