Adding missing stuff related to the last commit