Changed args to constructor