Further improvements for the database and properties file