[WIP] Add more completion settings