Contact All aspects improvements