Added the option to have attributes generated