Fixed issues with address entity and dependancies