fixed property mapper
implemented tasks