ClearFields functionality added