Removed hard dependency on address book pod