added Name Label and code to handle it