Changes for handling without the database