Added finish manger module