Added class constructor