-- Better handling of external frameworks