Use correct unpack function
Improve/expand the database configure logic for future use
Remove this ignore for now
Need a slightly different header