updated syntax for better multi org support