Added enhance and structure classes