Improve dev experience