Update following reimplementation of web resource models