Extended Version