Separate classes, remove casting, add alias instead.