Rewritting, cleanup and add some objects