added property location/suffix annotations