[BACKLOG-1148] Split individual trap category entities into multiple tra...

...p entities