Add address generation and database