Before Changing DB layer