Added configuration and proper encumberment