++ Added constructor and update type alias