Add stub for inverse mapping
Merge branch 'vinyl-features'