Added basic provider and controller