Added class to split address