adapting to SEVEN.Data changes