Updated doctrine address manager