Adding arbitrary database attributes
Merge branch 'feature/arbitrary_database_attrs'