Update of the project to make it more stand-alone and portable across applications