Updated to include fluent work
Fluent Interface added with lots of class name changes