Some abstract classes added to /src