Added DSM 5.0 compatibility limitation