Updated base framework