Added categorical and non-categorical variable functionality