Coding style fixes
Add support for "store" field mapping #94