Added custom initialization