Add additional checks