Separated classes from functions