Updates to prepare for basic auth