Minor changes + database schema change