Added class support
lol this sounds so trivial