Diploma version 2.0
Fix dependencies