Fixed missing imports to allow keyboard save