Further changes to constructor