Add file info builder support
Add normalization filter