Context management now in attributes