Updates to base framework