Small fixes
Added automation framework