Improve bootstrap layer support.

This pull request addresses issue #146