Fixed a bu with Objectindexers
Refactored Join(expr) to JoinOn(expr)
Refactored MapOptions to interfaces