Master branch Update after database prototype design