Added new file encoding resolvers