Updated object model for better runtime tuning