Added mapping conventions + class mappings