Initial changes to support house number