Added loader POC

Added loader
Fixed mapping