Added orm and custom settings