Updated for custom settings