Polished up base models a bit more