Refactored project and ticket