Added custom constructor code