Added some DB support