Added native  features plus mash up