Finished migrating to constructor functions