Refactored fixed and tagged classes.