DB Table Setup fixed