- Use [self class] to support extending classes
- Previous commit had an incorrect commit message