New classes from Sasha that made that need to be correctly implemented
in the future.