Added basic name functionality