Reverted to simpler apply form due to dependency for default effects