Added functionality for name field