Adding type and typeclass info
Fix merge conflicts.