Add OSGi support
Fix links
Implement new measure model