Added a completion shortcut suggestion
Updated the completion scope for the properties