Moved to Core File, Added in Basic Auth
Fixed settings conflict