Range entity refactored. Version rc18.

signed-off-by: Renan Fichberg <rfichberg@gmail.com>