Change optimization from 3 to 2
Add support for multiple brick contexts