Updated config and setup