Rebasing last changes
Simplified rule parsing in Data object