Updated project to v3.1