Added new constructor