Reload types refactor