Several setup concerns added