Some improvements for last commit