#384 Simplify configuration