Added static typing