Add classes from refacto