Added some new methods and updated DB structure