Migrated to configure method
Resolved merge conflicts