Refactor and Data Base added.