Handle boolean storage. Fixes #1