WIP #2: Placeholder classes now applies for wrappers. Belated closes #5