Updates to allow nullable values in database