Add prime and normal form
Add extra category