Updated paths and public