optional classes return for backwards compatibility