Complete rebuild, updated versions, added support for embedded