FIX: file_handler was named FileClass at some parts