More changes and code cleanup

* Tested setting up MySQL database
* Partially added attributes to the metadata