Added class and initializer