Fragments efficiency improvements