improved embedded and constraints support