Added better configurations for extras