Added remaining configuration implementation