Added custom configuratoin