improve database & role