Small additions

First steps to object mapping