Fix for prepare project to be generic