Closed #9 and closed #10: Brought cue categories according to the HATEOAS format