CLI-13 Final code before using local database