Adjusted callbacks behaviour