Extend the appropriate classes