Some cleaning up.
Use Poly Schema instead of Schema everywhere.