Added name and class pre-requisites