update DB schema and models to handle nullables