Moved implementaiton to public. Simplyfied fluent synthax
Implemented Map after FOR statement