Unify core constructor handling
Use Core API instead of direct imports