Modified Syntax to match with GS current design