Added functionality to ensure more than one of the same type isn't added