Refactor Knights for Inheritance