Improved orm mappings. Started cleaning application. Entity listeneres probably wanted;