Added support for more fily types.