Upgraded buweb content models