Added attribute validation