Add more code for overrides check