Added more methods and changing DB system...