Feature/extended tickets

Reorganization of ticket models done. This fixes #99 and #100