Added Code Analysis checks