Supporting compact form. Fixes #20