Meta model improved, some bugs related to that fixed.