Fixed code blocks to use the idented version
Improved With class to allow comparison of types from different class