Updates to common framework