Slight Entity wrapper + Range  changes