Added basic stub handling.