Added full name option to class