Update to shiva base code and shiva views feature