Added Exception and started name integration