Added functionality for apartment and building number