Added Strongly typing