Move to v1.6
Database improvements