Removing parametric type for domain
Finished removing parametric type, no slow down