improvement on Fluent Object