Completion enhancements