Add support for other classes with valid construtor