Added some required changes