Silence enum warnings
Update scheme
Update configurations