Add self build database and more logging