#24 - schema cahnges