Will my vocal range expand more?

I've been singing all through my life up to now and when I was in elementary school I sang like a soprano, but then in middle school my voice changed and now I sing b in high school. I'm 15 almost 16 years old and my range is D2-Eb4 at the moment and I was wondering whether its possible for my vocal range to get even higher? I seriously want to sing baritone parts but I need to be able to hit E4's or F4. Please HELP ME!!!