Added FileType support to all entries, some other additions/bug fixes