Add: first form in case classes
Add: temporary fix