Add Context list object and use it to simplify the code