Adding DTOs for IOStates, removing dirty annotation hack