Added class for init