Added code to manage