Updated for compatibility with dev preview 2