Added ability to use without classes