Updated for compatibility with dev preview 2
Added some dependencies