Added basic support for adding name