Refactor attribute hadling in Strategy::Payload