Added FileGator and refined integration