Added functionality to constructors