More functionality and MockDB added