CS fixes, new dependency, type check in constructor