Composer self-update
Use proper context files