Update contexts structure and add new contexts

Created by: zzet

After finish I'll rebase and split into one commit with force update PR branch