Update to RESTful and Database beans