Lot of changes. Unstable v0.3