Changes to lifetime handling
Added development dependency attributes