Adding additional checks