Feature #661: Refactor: Save source in database