Added configuration, skeleton of classes