Added typeId to training