Added structure of required classes