Moved context, boxes and variables in different features