Syntax changes as per hound request