Improving some aspects due to the changing in the Data Base layer.