Added class functions