do we really need standalone class?