Further details improvement