Added class options to make them more generallized