Moved some methods from facade down to map