Improved dynamic handling