More updates for dynamic support