Added Database Fields and Query