Update custom classes to work with latest