Making changes due to user fluent api.