Refactor tickets

Same here. We SHOULD use AR