Use consistent style of reference and pointer type declaration
Add support for native file format