Added features, not stable yet