Changes to put it as public project