Added static checks