Add course package and fix other content types