Added shared pilot classes.
Refactoring