Moving defaults to their respective classes