Detail improvements