Last work before Database-ification