Refactored missing class