Added class and method