Made config an embedded structure