[ALOY-443] updated to support additional notation