Fixes #75 Improve support for static columns