Added new detection classes
Merge branch 'master' into features/advanced-promises