Consistency changes to Statement data mappers