Proprietary layers. Fixes #16