WIP: Add more config