Changed profile format + some fixes
Merge branch 'new_hub'