added unified context option