Minor changes + database auto create + joined inheritence