Added addresses to generic api