Updated subtype builder