Added addToMap and removeFromMap convenience methods