Refactored missing header