Added option to add types