added push and pull interfaces
enhanced layout
rest helper for oneoff queries
mapping edition