Removed custom class support