Refactor of Loading to simplify types