Added dummy column to work around single column mapping limitation
package refactorings
cleanup