Improve render class handling.