v.0.1.1
Internal class enhancements