Move AddSpace to Util class