Got rid of DerivationState complexities