New class in next beta!