Small updates and new classes