Can now be used in multi-project. Small improvements.