Add ConstrcutorHandler and tests