Global changes

Added full database implementation