Adding strict checking