Manual mapping functions rewrite