Added basic site recognition
Updated tasks