Merged type class and base modules