Added common configuration