Updated for common changes
0.3.1