Added usage class and some functionality