Support more advanced configurations
Bump version