Added shops and shoptemplates (see pf 1186/1187)