Added support for position (should probably make more robust eventually)