Added class binding and test