Support offset and property options. Clean up.
Version