Changed extends and uses macro to Extends and Uses