Updated the constructor to better match needs.