Context management

Merging context features