Refactored claim assignment to Expirable construct