Added sharp classes (Hopefully we won't have to do that again)!