Update it to make the constructor cleaner