Setup - Adjust to new config & meta