Fixes currentframe()
Rewrites the mapping classes