Added basic classes (for real)