Moved function to subclasses; enabled + and new