Added constructor and renamed the base element