Refactored token signing and inclusion