Removed sample database
Added support for adding local/web content URIs/URLs
Method and variable renames