DOM access reduced and other enhancements